Index: help-tool/src/java/org/sakaiproject/jsf/help/ContextSensitiveTreeRender.java
===================================================================
--- help-tool/src/java/org/sakaiproject/jsf/help/ContextSensitiveTreeRender.java	(revision 74005)
+++ help-tool/src/java/org/sakaiproject/jsf/help/ContextSensitiveTreeRender.java	(working copy)
@@ -86,7 +86,7 @@
     //writer.write("<body onload='collapseAll([\"ol\"]); openBookMark();'>");
     writer.write("</head>\n");
 
-    writer.write("<body>\n");
+    writer.write("<body class=\"helpIndexBody\">\n");
     writer.write("<ol id=\"root\">");
     UIData data = (UIData) component;
     Object value = data.getValue();
@@ -141,12 +141,12 @@
       Set resources = new TreeSet(category.getResources());
       String id = category.getName();
       
-      writer.write("<li class=\"dir\">");
-      writer.write("<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\"><tr><td>");
+      writer.write("<li class=\"dir helpIndex\">");
+      writer.write("<h1>");
       writer.write("<img src=\"../image/toc_closed.gif\" alt=\"closed\" /></td>");      
-      writer.write("<td><a id=\"" + id + "\" href=\"#" + category.getName()
+      writer.write("<a id=\"" + id + "\" href=\"#" + category.getName()
           + "\" onclick=\"toggle(this)\">" + category.getName() + "</a></td>");
-      writer.write("</tr></table>");
+      writer.write("</h1>");
 
       writer.write("<ol class=\"docs\">");
       Set subCategories = new TreeSet(category.getCategories());
@@ -173,12 +173,12 @@
           }
           else
           {
-            writer.write("<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\"><tr><td>");
-            writer.write("<img src=\"../image/topic.gif\" alt=\"topic\"/></td>");            
-            writer.write("<td><a id=\"" + resource.getDocId()
+            writer.write("<h2>");
+            writer.write("<img src=\"../image/topic.gif\" alt=\"topic\"/>");            
+            writer.write("<a id=\"" + resource.getDocId()
                 + "\" href=\"content.hlp?docId=" + resource.getDocId()
-                + "\" target = \"content\">" + resource.getName() + "</a></td>");            
-            writer.write("</tr></table></li>\n");
+                + "\" target = \"content\">" + resource.getName() + "</a>");            
+            writer.write("</h2></li>\n");
           }
         }
       }
Index: help-tool/src/bundle/org/sakaiproject/tool/help/bundle/Messages.properties
===================================================================
--- help-tool/src/bundle/org/sakaiproject/tool/help/bundle/Messages.properties	(revision 74005)
+++ help-tool/src/bundle/org/sakaiproject/tool/help/bundle/Messages.properties	(working copy)
@@ -16,6 +16,7 @@
 search=Search Help
 search_button=Search
 search_result=Search Results
+search_result_summary=List of search results. Column 1: link to article; column 2: relevance.
 back=< Back
 forward=Forward >
 closeHelp=Close Help
Index: help-tool/src/webapp/search/main.jsp
===================================================================
--- help-tool/src/webapp/search/main.jsp	(revision 74005)
+++ help-tool/src/webapp/search/main.jsp	(working copy)
@@ -45,7 +45,7 @@
 </h:form>
 <sakai:group_box title="">
     <h:outputText value="#{SearchTool.numberOfResult}" />
-    <sakai:flat_list value="#{SearchTool.searchResults}" var="result">
+    <h:dataTable border="0" styleClass="listHier" value="#{SearchTool.searchResults}" var="result" summary="#{msgs.search_result_summary}">
 	    <h:column>
 	    	<h:outputLink value="../content.hlp?docId=#{result.docId}" target="content" style="font:8pt" rendered="#{SearchTool.isRestEnabled}">
   	      <h:outputText value="#{result.name}"/>
@@ -57,7 +57,7 @@
 		<h:column>
 			<h:outputText value="#{result.formattedScore}" style="font:8pt"/>
 		</h:column>
-    </sakai:flat_list>
+    </h:dataTable>
 </sakai:group_box>
 </sakai:view_container>
 </f:view>
Index: help-tool/src/webapp/css/csTree.css
===================================================================
--- help-tool/src/webapp/css/csTree.css	(revision 74005)
+++ help-tool/src/webapp/css/csTree.css	(working copy)
@@ -5,12 +5,13 @@
 
 ol.docs {display:none}
 
-li {margin-bottom: 1px; padding-left: 12px;  margin-top: 1px; font-size: 9pt}
 
 
 /** Added Oct 23, 2005 */
 
+/*
 a {font-size: 9pt}
+*/
 
 img {border: 0; margin-right: 1px}
 
@@ -23,3 +24,21 @@
 * html li {
         margin: 0 0 -3px 0
 } 
+
+
+.helpIndexBody h1{
+	padding:0;margin:0;font-size:9pt !important;
+}
+.helpIndexBody h1 img{
+	padding-right:3px;
+	}
+.helpIndexBody ol.docs{
+	margin:0;padding:0;
+}
+.helpIndexBody ol.docs li{
+	margin:0;padding:0;
+	}
+.helpIndexBody h2{
+	text-indent:-1.5em;font-size:9pt !important;
+	padding:2px 0 2px 1.5em !important;margin:0 0 0 1em
+}
Index: help-tool/src/webapp/js/csTree.js
===================================================================
--- help-tool/src/webapp/js/csTree.js	(revision 74005)
+++ help-tool/src/webapp/js/csTree.js	(working copy)
@@ -8,7 +8,7 @@
 
   var e = elm.parentNode;
   while (e){
-    if (e.tagName == "TABLE"){
+    if (e.tagName == "H1"){
       e = e.nextSibling;
       if (e && e.tagName == "OL"){
         if (!e.style.display || e.style.display== "none") {     
